auto merge of #1079 : alexcrichton/cargo/update-rust, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 21 Dec 2014 20:43:45 +0000 (20:43 +0000)
committerbors <bors@rust-lang.org>
Sun, 21 Dec 2014 20:43:45 +0000 (20:43 +0000)
Continuation of #1077
Closes https://github.com/rust-lang/cargo/pull/1079


Trivial merge